Add missing gdk_rectangle_get_type() prototype.

Mon Jun 11 18:15:16 2001  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdk.h: Add missing gdk_rectangle_get_type() prototype.

	* gtk/gtk[hv]scale.c: Include math.h, stdlib.h

	* gdk/gdkpango.h gtk/gtkclist.c gtk/gtkentry.c gtk/gtkmain.[ch]
	  gtk/gtkspinbutton.c gtk/gtkstyle.c gtk/gtktextbuffer.c
	  gtk/gtktextdisplay.c gtk/gtktextiter.[ch]
	  gtk/gtktextlayout.c gtk/gtktexttag.[ch] gtk/gtkwidget.c: Adapt
	  to recent changes in Pango.

	* tests/testgtk.c: Set language tags with gtk_label_set_markup()
	  to test whether the basic engine honors them.

diff --git a/gdk/gdk.h b/gdk/gdk.h
index 4d5bc2b84c800acbb852bd11fe9330a77fba3873..7f0f9758ae564383ad65f3aee68564cdf1178fcd 100644 (file)
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -126,6 +126,8 @@ void     gdk_rectangle_union     (GdkRectangle *src1,
                                  GdkRectangle *src2,
                                  GdkRectangle *dest);
 
+GType gdk_rectangle_get_type (void);
+
 #define GDK_TYPE_RECTANGLE (gdk_rectangle_get_type ())
 
 /* Conversion functions between wide char and multibyte strings. 

diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c
index 2ccb2c24a4f3eeaa1dd581aa3ae7a20dc21e2b14..4eeae8face98072316f1c8c1f9b0673683e621ae 100644 (file)
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.c
@@ -452,7 +452,7 @@ gdk_pango_get_item_properties (PangoItem      *item,
                               PangoRectangle *ink_rect,
                               PangoRectangle *logical_rect)
 {
-  GSList *tmp_list = item->extra_attrs;
+  GSList *tmp_list = item->analysis.extra_attrs;
 
   if (strikethrough)
       *strikethrough = FALSE;

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index a6352ae21681acf2f369b7aa9f73d74e92ab897a..76581eb1a3771d17262c858da74b9bb54994fb78 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -3027,11 +3027,11 @@ gtk_clist_set_row_height (GtkCList *clist,
       PangoContext *context = gtk_widget_get_pango_context (widget);
       PangoFontMetrics metrics;
       PangoFont *font = pango_context_load_font (context, widget->style->font_desc);
-      gchar *lang = pango_context_get_lang (context);
 
-      pango_font_get_metrics (font, lang, &metrics);
+      pango_font_get_metrics (font,
+                             pango_context_get_language (context),
+                             &metrics);
       
-      g_free (lang);
       g_object_unref (G_OBJECT (font));
       
       if (!GTK_CLIST_ROW_HEIGHT_SET(clist))

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index c7544817f433be13d1901ac160c0b915350faed2..60234f85f314958402afce134b050cefe1e4bcb9 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -1036,8 +1036,8 @@ gtk_entry_size_request (GtkWidget      *widget,
   GtkEntry *entry;
   PangoFontMetrics metrics;
   PangoFont *font;
-  gchar *lang;
   gint xborder, yborder;
+  PangoContext *context;
   
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_ENTRY (widget));
@@ -1047,11 +1047,11 @@ gtk_entry_size_request (GtkWidget      *widget,
   
   /* hackish for now, get metrics
    */
-  font = pango_context_load_font (gtk_widget_get_pango_context (widget),
-                                 widget->style->font_desc);
-  lang = pango_context_get_lang (gtk_widget_get_pango_context (widget));
-  pango_font_get_metrics (font, lang, &metrics);
-  g_free (lang);
+  context = gtk_widget_get_pango_context (widget);
+  font = pango_context_load_font (context, widget->style->font_desc);
+  pango_font_get_metrics (font,
+                         pango_context_get_language (context),
+                         &metrics);
   
   g_object_unref (G_OBJECT (font));
 

diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c
index ebd37861e46237407de665173dab7cca27f59aed..e940d50428ee98e0c187e35e837f4bf3acf04f38 100644 (file)
--- a/gtk/gtkhscale.c
+++ b/gtk/gtkhscale.c
@@ -24,7 +24,9 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include "gtkhscale.h"
 #include "gtksignal.h"
 #include "gtkintl.h"

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 689cea9b2f7551e82c316a6cd44ebc8624322050..94b5e4b57ee29a1e430f8b755cbc8bc097949feb 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -598,10 +598,11 @@ gtk_set_locale (void)
  * 
  * Return value: the default language as an allocated string, must be freed
  **/
-gchar*
+PangoLanguage *
 gtk_get_default_language (void)
 {
   gchar *lang;
+  PangoLanguage *result;
   gchar *p;
   
   lang = g_strdup (setlocale (LC_CTYPE, NULL));
@@ -612,6 +613,9 @@ gtk_get_default_language (void)
   if (p)
     *p = '\0';
 
+  result = pango_language_from_string (lang);
+  g_free (lang);
+  
   return lang;
 }
 

diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 083b0ba98bfac39b914f014a2d92bfeab5f79aae..1d7e5d2ce7719a221ff2f0add29385d198777a61 100644 (file)
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -106,11 +106,9 @@ gboolean gtk_init_check_abi_check (int       *argc,
 #ifndef GTK_DISABLE_DEPRECATED
 void     gtk_exit                 (gint    error_code);
 #endif /* GTK_DISABLE_DEPRECATED */
-gchar*   gtk_set_locale           (void);
-gchar*   gtk_get_default_language (void);
-gint     gtk_events_pending       (void);
-
-
+gchar *        gtk_set_locale           (void);
+PangoLanguage *gtk_get_default_language (void);
+gint           gtk_events_pending       (void);
 
 /* The following is the event func GTK+ registers with GDK
  * we expose it mainly to allow filtering of events between

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 76cea643e0ca1488c76648c9b4122c93e0e742a7..90bc385115818ee297de60d4ea4aa5e2653353f9 100644 (file)
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -567,19 +567,19 @@ gtk_spin_button_size_request (GtkWidget      *widget,
 
   if (entry->width_chars < 0)
     {
+      PangoContext *context;
       PangoFontMetrics metrics;
       PangoFont *font;
-      gchar *lang;
       gint width;
       gint w;
       int string_len;
 
-
-      font = pango_context_load_font (gtk_widget_get_pango_context (widget),
+      context = gtk_widget_get_pango_context (widget);
+      font = pango_context_load_font (context,
                                       widget->style->font_desc);
-      lang = pango_context_get_lang (gtk_widget_get_pango_context (widget));
-      pango_font_get_metrics (font, lang, &metrics);
-      g_free (lang);
+      pango_font_get_metrics (font,
+                             pango_context_get_language (context),
+                             &metrics);
       g_object_unref (G_OBJECT (font));
       
       /* Get max of MIN_SPIN_BUTTON_WIDTH, size of upper, size of lower */

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index e0c526ecd9644f9a010e676cd94dd3066c97290f..87ad7f8d543d1a97f5b74704cb30473bf8e33761 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -4076,7 +4076,7 @@ get_insensitive_layout (PangoLayout *layout)
 
       if (run)
         {
-          tmp_list = run->item->extra_attrs;
+          tmp_list = run->item->analysis.extra_attrs;
 
           while (tmp_list != NULL)
             {

diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 961fbf06335598d54997828348bdee1a7636a058..3a0a3d3f38eb5a8b054c4f4ac83330bb63ff1733 100644 (file)
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -3248,7 +3248,6 @@ compute_log_attrs (const GtkTextIter *iter,
   gchar *paragraph;
   gint char_len, byte_len;
   PangoLogAttr *attrs = NULL;
-  gchar *lang;
   
   start = *iter;
   end = *iter;
@@ -3267,14 +3266,10 @@ compute_log_attrs (const GtkTextIter *iter,
   
   attrs = g_new (PangoLogAttr, char_len);
   
-  lang = gtk_text_iter_get_language (&start);
-  
   pango_get_log_attrs (paragraph, byte_len, -1,
-                       lang,
+                      gtk_text_iter_get_language (&start),
                        attrs);
   
-  g_free (lang);
-
   g_free (paragraph);
 
   return attrs;

diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c
index c06c7cb4877d371272a912eef2b53509c337343b..0053f1b2ec539225114a453d392af1ff6f57a3d1 100644 (file)
--- a/gtk/gtktextdisplay.c
+++ b/gtk/gtktextdisplay.c
@@ -191,7 +191,7 @@ get_shape_extents (PangoLayoutRun *run,
                    PangoRectangle *ink_rect,
                    PangoRectangle *logical_rect)
 {
-  GSList *tmp_list = run->item->extra_attrs;
+  GSList *tmp_list = run->item->analysis.extra_attrs;
     
   while (tmp_list)
     {
@@ -653,7 +653,7 @@ static void
 get_item_properties (PangoItem          *item,
                      GtkTextAppearance **appearance)
 {
-  GSList *tmp_list = item->extra_attrs;
+  GSList *tmp_list = item->analysis.extra_attrs;
 
   *appearance = NULL;
 

diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index ae7dfecf11ced03ab0f7a02b6c494f7472ca5f20..af947d105eb8738a7b6d769e18d3d6c4e1d8aac1 100644 (file)
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -1379,17 +1379,17 @@ gtk_text_iter_editable (const GtkTextIter *iter,
  *
  * Return value: language in effect at @iter
  **/
-gchar*
+PangoLanguage *
 gtk_text_iter_get_language (const GtkTextIter *iter)
 {
   GtkTextAttributes *values;
-  gchar *retval;
-
+  PangoLanguage *retval;
+  
   values = gtk_text_attributes_new ();
 
   gtk_text_iter_get_attributes (iter, values);
 
-  retval = g_strdup (values->language);
+  retval = values->language;
 
   gtk_text_attributes_unref (values);
 

diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h
index 174be5d99a40c7591faf7c6f9fae399abb407e24..c3ea8516d7eeac8b2e19fd9c9b4311d8773e9748 100644 (file)
--- a/gtk/gtktextiter.h
+++ b/gtk/gtktextiter.h
@@ -142,11 +142,11 @@ gboolean gtk_text_iter_is_cursor_position (const GtkTextIter   *iter);
 gint     gtk_text_iter_get_chars_in_line (const GtkTextIter   *iter);
 gint     gtk_text_iter_get_bytes_in_line (const GtkTextIter   *iter);
 
-gboolean gtk_text_iter_get_attributes    (const GtkTextIter    *iter,
-                                          GtkTextAttributes    *values);
-gchar*   gtk_text_iter_get_language      (const GtkTextIter    *iter);
-gboolean gtk_text_iter_is_end            (const GtkTextIter    *iter);
-gboolean gtk_text_iter_is_start          (const GtkTextIter    *iter);
+gboolean       gtk_text_iter_get_attributes (const GtkTextIter *iter,
+                                            GtkTextAttributes *values);
+PangoLanguage* gtk_text_iter_get_language   (const GtkTextIter *iter);
+gboolean       gtk_text_iter_is_end         (const GtkTextIter *iter);
+gboolean       gtk_text_iter_is_start       (const GtkTextIter *iter);
 
 /*
  * Moving around the buffer

diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 2aef53e5989e77bb39b0ebc4e278a80fcbd40e42..603c47af92dc17e6b47b0bf3b2fc8de70a4e40db 100644 (file)
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -1492,7 +1492,7 @@ add_cursor (GtkTextLayout      *layout,
 static gboolean
 is_shape (PangoLayoutRun *run)
 {
-  GSList *tmp_list = run->item->extra_attrs;
+  GSList *tmp_list = run->item->analysis.extra_attrs;
     
   while (tmp_list)
     {
@@ -1582,6 +1582,7 @@ add_preedit_attrs (GtkTextLayout     *layout,
       PangoAttribute *insert_attr;
       GSList *extra_attrs = NULL;
       GSList *tmp_list;
+      PangoLanguage *language;
       gint start, end;
 
       pango_attr_iterator_range (iter, &start, &end);
@@ -1590,7 +1591,7 @@ add_preedit_attrs (GtkTextLayout     *layout,
        end = layout->preedit_len;
       
       pango_attr_iterator_get_font (iter, &style->font,
-                                   &font_desc, &extra_attrs);
+                                   &font_desc, &language, &extra_attrs);
       
       tmp_list = extra_attrs;
       while (tmp_list)
@@ -1631,6 +1632,15 @@ add_preedit_attrs (GtkTextLayout     *layout,
       
       pango_attr_list_insert (attrs, insert_attr);
 
+      if (language)
+       {
+         insert_attr = pango_attr_language_new (language);
+         insert_attr->start_index = start + offset;
+         insert_attr->end_index = end + offset;
+         
+         pango_attr_list_insert (attrs, insert_attr);
+       }
+
       add_generic_attrs (layout, &appearance, end - start,
                          attrs, start + offset,
                          size_only, TRUE);

diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index c149c4edadf3ea3dbf7a770e911f998894836ca3..104339f29a1dd5c68e98bc205921cb4a7c75220a 100644 (file)
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -1088,7 +1088,7 @@ gtk_text_tag_set_property (GObject      *object,
 
     case PROP_LANGUAGE:
       text_tag->language_set = TRUE;
-      text_tag->values->language = g_strdup (g_value_get_string (value));
+      text_tag->values->language = pango_language_from_string (g_value_get_string (value));
       g_object_notify (G_OBJECT (text_tag), "language_set");
       break;
 
@@ -1425,7 +1425,7 @@ gtk_text_tag_get_property (GObject      *object,
       break;
 
     case PROP_LANGUAGE:
-      g_value_set_string (value, tag->values->language);
+      g_value_set_string (value, pango_language_to_string (tag->values->language));
       break;
 
     case PROP_TABS:
@@ -1818,9 +1818,6 @@ gtk_text_attributes_copy_values (GtkTextAttributes *src,
   if (dest->appearance.fg_stipple)
     gdk_bitmap_unref (dest->appearance.fg_stipple);
 
-  if (dest->language)
-    g_free (dest->language);
-
   if (dest->font.family_name)
     g_free (dest->font.family_name);
   
@@ -1832,7 +1829,7 @@ gtk_text_attributes_copy_values (GtkTextAttributes *src,
   if (src->tabs)
     dest->tabs = pango_tab_array_copy (src->tabs);
 
-  dest->language = g_strdup (src->language);
+  dest->language = src->language;
 
   dest->font.family_name = g_strdup (src->font.family_name);
   
@@ -1882,9 +1879,6 @@ gtk_text_attributes_unref (GtkTextAttributes *values)
       if (values->tabs)
         pango_tab_array_free (values->tabs);
 
-      if (values->language)
-        g_free (values->language);
-
       if (values->font.family_name)
         g_free (values->font.family_name);
       
@@ -2059,10 +2053,7 @@ _gtk_text_attributes_fill_from_tags (GtkTextAttributes *dest,
         dest->bg_full_height = vals->bg_full_height;
 
       if (tag->language_set)
-        {
-          g_free (dest->language);
-          dest->language = g_strdup (vals->language);
-        }
+       dest->language = vals->language;
 
       ++n;
     }

diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index f75a1760b0635991ef4381bca7eaebf7ee6e268e..10b7bb2980d3a43f5f8d20072b40a2fae95fa9de 100644 (file)
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -170,7 +170,7 @@ struct _GtkTextAttributes
                                  * GTK_WRAPMODE_NONE, GTK_WRAPMODE_WORD
                                  */
 
-  gchar *language;
+  PangoLanguage *language;
 
   /* hide the text  */
   guint invisible : 1;

diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c
index 2dca2cc99e3723710fadd69bf431b9d4cbbb5010..ae18dfa025bc00f192d67cb6640bc3c4c58012a8 100644 (file)
--- a/gtk/gtkvscale.c
+++ b/gtk/gtkvscale.c
@@ -24,7 +24,9 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include "gtkvscale.h"
 #include "gtksignal.h"
 #include "gtkintl.h"

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 790476875e6331be380f2f41a4d0c10a8bb2ac63..c6ba8adc1a462dd1300afe46badd689e80dfa943 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3989,7 +3989,6 @@ PangoContext *
 gtk_widget_create_pango_context (GtkWidget *widget)
 {
   PangoContext *context;
-  char *lang;
 
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 
@@ -4000,10 +3999,7 @@ gtk_widget_create_pango_context (GtkWidget *widget)
                              gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ?
                                PANGO_DIRECTION_LTR : PANGO_DIRECTION_RTL);
   pango_context_set_font_description (context, widget->style->font_desc);
-
-  lang = gtk_get_default_language ();  
-  pango_context_set_lang (context, lang);
-  g_free (lang);
+  pango_context_set_language (context, gtk_get_default_language ());
 
   return context;
 }

diff --git a/tests/testgtk.c b/tests/testgtk.c
index e6042b54c3f263d01a9542ed70f6606f50bd7e01..cd0ad710cae93ac1a87632d6cfa29275a7d3ee0f 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -2105,9 +2105,14 @@ void create_labels (void)
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
       frame = gtk_frame_new ("Internationalized Label");
-      label = gtk_label_new ("French (Français) Bonjour, Salut\n"
-                            "Korean (한글)   안녕하세요, 안녕하십니까\n"
-                            "Russian (Русский) Здравствуйте!");
+      label = gtk_label_new (NULL);
+      gtk_label_set_markup (GTK_LABEL (label),
+                           "French (Français) Bonjour, Salut\n"
+                           "Korean (한글)   안녕하세요, 안녕하십니까\n"
+                           "Russian (Русский) Здравствуйте!\n"
+                           "Chinese (Simplified) <span lang=\"zh-cn\">元气   开发</span>\n"
+                           "Chinese (Traditional) <span lang=\"zh-tw\">元氣  開發</span>\n"
+                           "Japanese <span lang=\"ja\">元気  開発</span>");
       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
       gtk_container_add (GTK_CONTAINER (frame), label);
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);